From 2cfbbaf37507dc875888c422495742cba4d161d4 Mon Sep 17 00:00:00 2001 From: "tlh20@labyrinth.cl.cam.ac.uk" Date: Wed, 10 Sep 2003 17:16:58 +0000 Subject: [PATCH] bitkeeper revision 1.418.1.4 (3f5f5c8a0reuxzNwVh_SoCrfv-HfGw) Many files: Improve xenctl error messages --- .../src/org/xenoserver/control/CommandDomainNew.java | 10 +++++++++- .../org/xenoserver/control/CommandPhysicalGrant.java | 6 +++--- .../org/xenoserver/control/CommandPhysicalRevoke.java | 7 +++---- .../xenoserver/control/CommandVbdCreatePhysical.java | 5 +++-- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/tools/control/src/org/xenoserver/control/CommandDomainNew.java b/tools/control/src/org/xenoserver/control/CommandDomainNew.java index b8341551d1..54b12e0aa0 100644 --- a/tools/control/src/org/xenoserver/control/CommandDomainNew.java +++ b/tools/control/src/org/xenoserver/control/CommandDomainNew.java @@ -6,6 +6,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; +import java.lang.NumberFormatException; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.zip.GZIPInputStream; @@ -182,7 +183,14 @@ public class CommandDomainNew extends Command { br = new BufferedReader( new InputStreamReader(create_p.getInputStream())); - domain_id = Integer.parseInt(br.readLine()); + try + { + domain_id = Integer.parseInt(br.readLine()); + } + catch (NumberFormatException nfe) + { + domain_id = -1; + } create_rc = create_p.waitFor(); } d.domainNumber = domain_id; diff --git a/tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java b/tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java index 8e276f071d..68194e912d 100644 --- a/tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java +++ b/tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java @@ -42,11 +42,11 @@ public class CommandPhysicalGrant extends Command { public String execute() throws CommandFailedException { Runtime r = Runtime.getRuntime(); String output = null; - - Partition partition = PartitionManager.IT.getPartition(StringPattern.parse(partition_name).resolve(domain_id)); + String resolved = StringPattern.parse(partition_name).resolve(domain_id); + Partition partition = PartitionManager.IT.getPartition(resolved); if ( partition == null ) { - throw new CommandFailedException("Partition " + partition_name + " does not exist."); + throw new CommandFailedException("Partition " + partition_name + " (resolved to " + resolved + ") does not exist."); } // Check if this partition belongs to the VDM diff --git a/tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java b/tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java index 5d4c0e8e41..b752473001 100644 --- a/tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java +++ b/tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java @@ -29,12 +29,11 @@ public class CommandPhysicalRevoke extends Command { public String execute() throws CommandFailedException { Runtime r = Runtime.getRuntime(); String output = null; - - Partition partition = PartitionManager.IT.getPartition(StringPattern.parse(partition_name).resolve(domain_id)); + String resolved = StringPattern.parse(partition_name).resolve(domain_id); + Partition partition = PartitionManager.IT.getPartition(resolved); if (partition == null) { - throw new CommandFailedException( - "Partition " + partition_name + " does not exist."); + throw new CommandFailedException("Partition " + partition_name + " (resolved to " + resolved + ") does not exist."); } try { diff --git a/tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java b/tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java index 5e547a7a3b..2f63446e01 100644 --- a/tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java +++ b/tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java @@ -38,10 +38,11 @@ public class CommandVbdCreatePhysical extends Command { * @see org.xenoserver.control.Command#execute() */ public String execute() throws CommandFailedException { - Partition partition = PartitionManager.IT.getPartition(StringPattern.parse(partition_name).resolve(domain_id)); + String resolved = StringPattern.parse(partition_name).resolve(domain_id); + Partition partition = PartitionManager.IT.getPartition(resolved); if (partition == null) { throw new CommandFailedException( - "No partition " + partition_name + " exists"); + "No partition " + partition_name + " (resolved to " + resolved + ") exists"); } VirtualDisk vd = new VirtualDisk("vbd:" + partition.getName()); -- 2.30.2